Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Dec 2011 17:06:42 +0000 (09:06 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Dec 2011 17:06:42 +0000 (09:06 -0800)
commitc1db29b6945dbd9a3975fe1d8ed7663bd5085500
tree7d549b892f18691c1782c96c618f11ba09cedb6e
parentfaf4c4dccd7079fb0f18bfde4258d9c0e15f92ac
parent055041b783b6f6c6e4b206d1123c8f2434a618d3
Merge from trunk.